auto merge of #897 : alexcrichton/cargo/issue-879, r=brson
authorbors <bors@rust-lang.org>
Tue, 18 Nov 2014 22:59:26 +0000 (22:59 +0000)
committerbors <bors@rust-lang.org>
Tue, 18 Nov 2014 22:59:26 +0000 (22:59 +0000)
Closes #879


Trivial merge